From 52f8fd8242243a0667cce55994bb6272664a5c6d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timm=20B=C3=A4der?= Date: Wed, 3 May 2017 11:43:47 +0200 Subject: [PATCH] scrolledwindow: Remove css box drawing --- gtk/gtkscrolledwindow.c | 36 +++++++++--------------------------- 1 file changed, 9 insertions(+), 27 deletions(-) diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c index 634e7f2d06..61615d4b1f 100644 --- a/gtk/gtkscrolledwindow.c +++ b/gtk/gtkscrolledwindow.c @@ -1863,31 +1863,6 @@ gtk_scrolled_window_snapshot_undershoot (GtkScrolledWindow *scrolled_window, } } -static gboolean -gtk_scrolled_window_render (GtkCssGadget *gadget, - GtkSnapshot *snapshot, - int x, - int y, - int width, - int height, - gpointer data) -{ - GtkWidget *widget = gtk_css_gadget_get_owner (gadget); - GtkScrolledWindow *scrolled_window = GTK_SCROLLED_WINDOW (widget); - GtkScrolledWindowPrivate *priv = scrolled_window->priv; - - if (priv->hscrollbar_visible && - priv->vscrollbar_visible) - gtk_scrolled_window_snapshot_scrollbars_junction (scrolled_window, snapshot); - - GTK_WIDGET_CLASS (gtk_scrolled_window_parent_class)->snapshot (widget, snapshot); - - gtk_scrolled_window_snapshot_undershoot (scrolled_window, snapshot); - gtk_scrolled_window_snapshot_overshoot (scrolled_window, snapshot); - - return FALSE; -} - static void gtk_scrolled_window_init (GtkScrolledWindow *scrolled_window) { @@ -1971,7 +1946,7 @@ gtk_scrolled_window_init (GtkScrolledWindow *scrolled_window) widget, gtk_scrolled_window_measure, gtk_scrolled_window_allocate, - gtk_scrolled_window_render, + NULL, NULL, NULL); for (i = 0; i < 4; i++) { @@ -2789,7 +2764,14 @@ gtk_scrolled_window_snapshot (GtkWidget *widget, GtkScrolledWindow *scrolled_window = GTK_SCROLLED_WINDOW (widget); GtkScrolledWindowPrivate *priv = scrolled_window->priv; - gtk_css_gadget_snapshot (priv->gadget, snapshot); + if (priv->hscrollbar_visible && + priv->vscrollbar_visible) + gtk_scrolled_window_snapshot_scrollbars_junction (scrolled_window, snapshot); + + GTK_WIDGET_CLASS (gtk_scrolled_window_parent_class)->snapshot (widget, snapshot); + + gtk_scrolled_window_snapshot_undershoot (scrolled_window, snapshot); + gtk_scrolled_window_snapshot_overshoot (scrolled_window, snapshot); } static gboolean -- 2.30.2